From: Keir Fraser <keir.fraser@citrix.com>
Date: Mon, 21 Jul 2008 08:42:30 +0000 (+0100)
Subject: [XSM][FLASK] Remove unused code from XSM and Flask
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14171^2~16
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=9829c9f3ec5266b57cd01d2a93451480186d0658;p=xen.git

[XSM][FLASK] Remove unused code from XSM and Flask

The complete_init hook has been unused since the introduction of the
create secure interface for domain_create.

Signed-off-by: George Coker <gscoker@alpha.ncsc.mil>
---

diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h
index 3b495cc052..7277e18c99 100644
--- a/xen/include/xsm/xsm.h
+++ b/xen/include/xsm/xsm.h
@@ -108,7 +108,6 @@ struct xsm_operations {
     int (*schedop_shutdown) (struct domain *d1, struct domain *d2);
 
     long (*__do_xsm_op) (XEN_GUEST_HANDLE(xsm_op_t) op);
-    void (*complete_init) (struct domain *d);
 
 #ifdef CONFIG_X86
     int (*shadow_control) (struct domain *d, uint32_t op);
@@ -392,11 +391,6 @@ static inline long __do_xsm_op (XEN_GUEST_HANDLE(xsm_op_t) op)
     return xsm_call(__do_xsm_op(op));
 }
 
-static inline void xsm_complete_init (struct domain *d)
-{
-    xsm_call(complete_init(d));
-}
-
 #ifdef XSM_ENABLE
 extern int xsm_init(unsigned int *initrdidx, const multiboot_info_t *mbi,
                                           unsigned long initial_images_start);
diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c
index 0caa487f75..b9ff510b42 100644
--- a/xen/xsm/dummy.c
+++ b/xen/xsm/dummy.c
@@ -254,11 +254,6 @@ static void dummy_free_security_evtchn (struct evtchn *chn)
     return;
 }
 
-static void dummy_complete_init (struct domain *d)
-{
-    return;
-}
-
 static long dummy___do_xsm_op(XEN_GUEST_HANDLE(xsm_op_t) op)
 {
     return -ENOSYS;
@@ -462,7 +457,6 @@ void xsm_fixup_ops (struct xsm_operations *ops)
     set_to_dummy_if_null(ops, schedop_shutdown);
 
     set_to_dummy_if_null(ops, __do_xsm_op);
-    set_to_dummy_if_null(ops, complete_init);
 
 #ifdef CONFIG_X86
     set_to_dummy_if_null(ops, shadow_control);
diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c
index 6ebe1eab48..a7553c1250 100644
--- a/xen/xsm/flask/hooks.c
+++ b/xen/xsm/flask/hooks.c
@@ -714,18 +714,6 @@ static int flask_perfcontrol(void)
     return domain_has_xen(current->domain, XEN__PERFCONTROL);
 }
 
-void flask_complete_init(struct domain *d)
-{
-    struct domain_security_struct *dsec;
-
-    /* Set the security state for the Dom0 domain. */
-    dsec = d->ssid;
-    dsec->sid = SECINITSID_DOM0;
-    dsec->create_sid = SECINITSID_UNLABELED;
-
-    printk("Flask:  Completed initialization.\n");
-}
-
 #ifdef CONFIG_X86
 static int flask_shadow_control(struct domain *d, uint32_t op)
 {
@@ -1101,7 +1089,6 @@ static struct xsm_operations flask_ops = {
     .schedop_shutdown = flask_schedop_shutdown,
 
     .__do_xsm_op = do_flask_op,
-    .complete_init = flask_complete_init,    
 
 #ifdef CONFIG_X86
     .shadow_control = flask_shadow_control,